Merge changes If4271719,I9c9b5de9,I46a26a67 into oc-dr1-dev
am: ddd9c71272

Change-Id: Ie3868b140dfc675f450ac5f436f3533c1d2bdc93