Merge changes from topic "am-a72dc847-1338-48a7-a594-f88ad937d23b" into oc-dev am: c6dac7c211
am: 4d529aa6a1

Change-Id: I9ae14e39d62c860f1182bfe33570d1dcb3b8d54c