Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev am: c3b4881ea5
am: 4f74605d11

Change-Id: Id25fb236775c0055f6d9d32b9c67aab5c9acf570