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

Change-Id: Iecb648023e549560c2b4b4ae203c37eeb2b40126