Merge changes Ia776548f,I6948de2f into oc-mr1-dev am: df2360469e am: b94789e919 am: 3bb811fdfe am: 29dc76e426

Change-Id: I1b62c0f4cc741c86f4c99c86aa8d7a89b7c006f3