Merge "Prevent printing from finishing activity." into nyc-dev
am: 41304f47f4

* commit '41304f47f4d5d6cdd4d160c9553f47b1e641aff8':
  Prevent printing from finishing activity.

Change-Id: I4ab24c8ace1023c481244431bbac8cfbce4003a4