Merge cherrypicks of ['googleplex-android-review.googlesource.com/23219878', 'googleplex-android-review.googlesource.com/23219026'] into tm-qpr3-c-release.

Change-Id: Ie0afabcb4c2321cc0637d1cd400bda5fac2a9a4e