Merge cherrypicks of ['googleplex-android-review.googlesource.com/33538974', 'googleplex-android-review.googlesource.com/33538975', 'googleplex-android-review.googlesource.com/33538976'] into tm-platform-release. Change-Id: I730f4c14854d3845e255831bb93c118be56496ef