am 7530f568: am 7585387b: am fceb05f5: am a7d389ba: Merge "Fix and cleanup UI rendering CTS tests" into lmp-sprout-dev

* commit '7530f568494f39a2e9ddc00db7dd8f11ab8d0669':