Merge changes I573e4fb9,I8e7baadc into oc-dev
am: 67e38774ce

Change-Id: Id3a830eb46004a3febdb9c4bf96a39b8c4afaedd