Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into oc-dev am: 471a4e6076 am: 5c6dd2cd0c
am: 8e3506d991

Change-Id: I95e2ee5618dca3ac27cee8c32d0314211959390e