Merge changes I7b5504d0,I10c263dc into oc-dev am: 8902bbe4e3
am: ae8e0149cf

Change-Id: Ibb220dc05fcf2713943bdd1287e46b896f4d2df6