Merge changes from topic "am-89fe5346-d048-4a7e-b219-5691d6788fba" into oc-mr1-dev am: 8d35fd363c
am: bcd17495ab

Change-Id: I9439bd4c9a190ea022ce6dccc0985374c06627ed