Merge "Fix trial run in AppLaunch test" am: 3e83b4cad8
am: fdbf99782e

Change-Id: I8f5fc7afb3c514ab862a3a99d3f93e77f65d698a