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

Change-Id: I8f3c648e257bcbc614482dc3816be743da1d79c2