Merge changes from topic "am-f118bd02-223c-430c-b511-d73dcdeba196" into oc-dev am: aadf040e87
am: 2ccc17e201

Change-Id: Ie0b2e5df27fc628a83bcd25e3702c9d8186fd709