Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev am: 4191d99614
am: 7031cdda50

Change-Id: I6eb6069005460d372288d79b8a2387518842e73f