Merge changes from topic 'am-993c43530b0f4dacbb88b40a1b1760de' into oc-mr1-dev-plus-aosp
am: 836b9d1c7a

Change-Id: Ifad5e11ca05f2c6d53be99871d8b40ad1b791638