Merge changes from topic 'aod-mr1' into oc-mr1-dev
am: 352d099c83

Change-Id: Ia19dcf394ea8eb0350639dcd8e290ec6cd97b6fa