Merge changes I23e6f088,I800208e8,I55123a7a into oc-dr1-dev am: 607b5d1b40
am: 1042a22877

Change-Id: I4c5e092f7119fb9a90e791dd31fbdb4f56b811cd