Merge "Merge "Merge changes Iea55330d,I547319f2 am: 7369c92fbc am: 6bf19f7c77" into oc-dev-plus-aosp am: 2974b29bf9" into oc-dr1-dev-plus-aosp
am: 67969265f6

Change-Id: I95e38be8c18d66a1feb017b87e8fd7c67f539c44