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

Change-Id: I063c6809d2a775d60def25070282e0ef0db09712