Merge cherrypicks of ['googleplex-android-review.googlesource.com/29062464', 'googleplex-android-review.googlesource.com/29062465'] into 24Q3-platform-release.

Change-Id: I791286bb4cc2fb105dcbcc97739474866382de81