Merge "Merge changes I5c16c650,I3151fb6b am: 55efea25f3 am: ad2684ca3d am: 6b29b1c256" into oc-dev-plus-aosp