Merge "Merge changes I3b56e75d,I36255a2c am: 5c7128c0 am: 464d7635 am: ff426ec1" into oc-mr1-dev-plus-aosp