Merge changes from topic 'launch-2d-activities-vr' into oc-dev
am: f04d039584

Change-Id: I820ec3a9c1379bf9bcc688e36bcfeb00ac753a22