Merge "Fix code coverage for apps" am: 2e8a1fc
am: 274a5a5

* commit '274a5a5efe1447ba4c13faf2f31c30d8b1dd72e5':
  Fix code coverage for apps

Change-Id: I751ee937222a76c2795f2dcdc0e2ca86ea7924d4