Merge "Merge changes Iea55330d,I547319f2 am: 7369c92fbc am: 6bf19f7c77" into oc-dev-plus-aosp
am: cefbb705d2

Change-Id: I5c728fc5becf2f8dd6d0cf907302915a2d5092b6