Merge changes from topic "am-111fe0c7-85ec-4188-9975-73388bebf4b2" into oc-dev am: 6d845ade8e
am: 4d42fd62bc

Change-Id: I52dd1e21c81d97198a285049daa30dc56c86ecc4