Merge "Merge "Follow-up for I8cbf1bfbebc917b03f528f040bb019d193228bbb" into oc-dev am: 6adb089cab" into oc-dev-plus-aosp
am: 02cdcd1285

Change-Id: I192473f1613629419027bfe39d8c293d8c860436