Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev am: bd9caf4c6f am: 2b605d89b9 am: 64c1873c30 am: 6dbef2a740
am: 10b5ae6440

Change-Id: I587dd6c49c89a3309ff0edd0db7752bdd3a91fc9