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

Change-Id: Idd809abedb4e0a63bca117cdb6ce7ec89b6fa64a