Merge changes from topic 'am-a3904e70ae584ef4bb777fa8f1c88fb1' into oc-dr1-dev-plus-aosp
am: 81a56fa2cd

Change-Id: I96676998cb7409e6b072de5b329fdec5422d7a15