Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100 am: 75576617 am: 199b3ee0 Change-Id: I7330886e1c2ddcbb92c1a3fa03e9a4a8276d31a2