Merge changes from topic "am-0b54e3df-be82-462c-92ce-d33585c1a919" into oc-dev am: 6df61a52f4 am: 0e0c772361
am: 312fc5f343

Change-Id: Ib4af486aa69b9bed287b990eeb8903887a3628ab