Merge changes from topic "am-a026fb066f5d4de6b6b8eed401a8d29a" into oc-dev am: 20636372be am: 3f2f4efdbd
am: cd4cb24ecd

Change-Id: I70a163256f03cfc5a5519929227b97083745cc93