Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am: 3bbe3c7c93
am: 24701167ba

Change-Id: I2cc8202e1abaf739a71126665599c3b262f5e7d7