Merge changes I1d00d86e,I16d81113 into oc-dev am: f9db6d3b5f
am: 815388af6c

Change-Id: I8d58a312a5340762a15e1a97f441f08169c85935