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: I014a0862a426e7025a4589d60df94ebe61d13ee7