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

Change-Id: I902bdfe54cce315a91fe8ec0afb9d2fa2310195b