Merge changes from topic '62033391' into oc-dr1-dev
am: 97d1c4f234

Change-Id: I7c6ccac7f3382f938f355002720350f6e03a628e