Merge changes from topic "am-e98b014a-64b0-43a4-a8eb-a11085ff1032" into oc-dr1-dev
am: 561e1704bd

Change-Id: I2215c31a4386948101392b26c22879a8975f9b75