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

Change-Id: I7c55be3340ad08e8142c39804ea2b28d8492de00