Cherry picked from CL 73484 in GB. Change-Id: Ieb6ee5b4bf85226a8c488f78f5ff00a57fc031b8
e3e8642c
001c7d12