Test: none needed Change-Id: Ic63feabbe5c1500b73c5a8f1b8b60396ff0ebd40 Merged-In: Ic63feabbe5c1500b73c5a8f1b8b60396ff0ebd40 (cherry picked from commit af0f766c)