Merge changes Ifbd1e8d9,I1e017b6f into oc-mr1-dev
am: 4faae82855

Change-Id: I0b4b9ee3614aa2d69887f05d0f24e5e2dc379308