65c94e6959
Also addresses style issues noted in post-submit review from https://googleplex-android-review.git.corp.google.com/#/c/439054/ Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5 related-to-bug: 12702350