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

Change-Id: I9617b0192d649ac63bc7f1d587590000bae3cf86