Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev
am: a86ba9b6e5

Change-Id: I46efd01a25ff71885d5573e28731593a1cebb865