Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev
am: c6c611293d

Change-Id: I74ee0d6e477345487b6056b3e1f92a41ba67731f