Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev
am: 504ea09356

Change-Id: Ifd1f209c7e71ea731363af01dcc0894b5553612b