Merge changes Ica5f5f5c,Ifb7d2cec,Ia402b4bc,I9c3b6b7e,I36ba19c7, ... into oc-dev am: 1b47dfd749
am: f19cd0902f

Change-Id: Ia0c084c9f4a4c7e3fe470b12716448e71462eb12