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

Change-Id: I5021109e1bff6a90d99bea6af5956a19d815ea6b