Merge changes from topic "am-582d42df-93d2-4a31-91c1-a549dbe0560e" into oc-dr1-dev
am: 79b3b7ac3e

Change-Id: I4312b7c5feef9b45b5e5dc1555b97b99800c53f0