Merge changes I446fb6ab,Ife3bbd29 into oc-dev am: 53c9898e79
am: 66534ef01c

Change-Id: I62d31b0d933a2f06b5a97f16447d7500b7fe71d1