Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: If6b18742d2eb8f5a7d69c5a2ef2aa1c9de2bd248
Change-Id: I4921f12ce80f14dff39c8838b5325f54e19c38f4