Merge changes Id60bc858,I32c4eb53,I5b81fb8f into oc-dr1-dev am: d1a616761d
am: 640046b738

Change-Id: I9c9b4f432051079b5f290cb06de40ddda0481060