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

* commit '2e8a1fc96695478be7e0d9efc3f99a305b10930b':
  Fix code coverage for apps

Change-Id: I0fc712c82c55079dc88b5d58ff29958e06f4885d