Merge "Update reference to top activity." into oc-mr1-dev am: f35bfc3d0c
am: c8aa54117f

Change-Id: I059475037e2d7724af255cedccec852a3ae74d94