This change must be checked in together with I737c266c45.

Bug: 13011041
Change-Id: Ia3d25be6de47fa16ab7156a25641e53a23948ff4