Merge "Follow-up to 70d60275cc2860bde50e5f9c5b151e94f745ae14" am: bea9172064
am: 1f175053aa

Change-Id: I424fbf84a1991ea46956a53678264ec4300219ca