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

Change-Id: If282600586310eb4dc03523f4883ff15ac2db651