Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-dev am: 075bcf73c8
am: dff068e1e8

Change-Id: I562e53f089ca19fc145a34fb539556ae92d05722