Merge cherrypicks of ['googleplex-android-review.googlesource.com/21159680',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21159680', 'googleplex-android-review.googlesource.com/21266934', 'googleplex-android-review.googlesource.com/21389013', 'googleplex-android-review.googlesource.com/21422765', 'googleplex-android-review.googlesource.com/21238189', 'googleplex-android-review.googlesource.com/21568941', 'googleplex-android-review.googlesource.com/21534012', 'googleplex-android-review.googlesource.com/21649216', 'googleplex-android-review.googlesource.com/21688022'] into tm-qpr2-release.

Change-Id: I3293f67075d99e736cae14b81f8cbcf47569f858