Merge "Fix code coverage for apps" into nyc-dev
am: e771251  -s ours

* commit 'e771251424bc01fbf663dd5aa8ffa6938bbae29c':
  Fix code coverage for apps

Change-Id: Ie49e766727139c04e429178cd19b508c1a963437