Merge changes from topic "am-ebe1034d-b536-4ea3-9996-9eaf7325959f" into oc-dev am: e89ac7e0c0
am: f4a0fa830d

Change-Id: Id7790f9bab830c3aa8304548a90d6a6ffe02c5c6