am a2347bb4: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/cts into lmp-mr1-ub-dev * commit 'a2347bb4':