IMPORTANT: this change has a docs/UPDATING entry! Change-Id: I6f1e575166f5b47530a004c12aea9b45b571e13d