Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d am: f051b285 am: 5d61a661 Change-Id: I0eeeb695d9125b05d136700b3e03157c25a302fc