Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4
am: dededea9f3

Change-Id: Ia42df7f876f964d153b217de4f501a0b7f03d363