Merge "Merge "Merge changes Iea55330d,I547319f2 am: 7369c92f am: 6bf19f7c" into oc-dev-plus-aosp am: 2974b29b" into oc-dr1-dev-plus-aosp am: 7d6e91f7 Change-Id: Ia8fe57179258ff3a8b4ab544a045c659b357e68c