Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c am: 4d2a9a9f" into oc-dr1-dev-plus-aosp am: ed07898d Change-Id: I468d43c265ab002ccabd3f33f8375d81f17ac66e