Merge changes from topic 'am-608338568dd24535a5feb566bcc48cf7' into oc-dr1-dev-plus-aosp
am: c6e3a65dff

Change-Id: I34f0f22ba29e4e1a2cba10a2a9f5799d09eb3ec7