Merge changes Ie1686719,Ie6af7751 into oc-dev
am: ba911a25bb

Change-Id: Ia133e74b14afe5b819e9e0ffed3872629d2859ec