Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
am: 3462f03144

Change-Id: Ie95b06cd45924664c7a05e649fc96ac4d0f66745