Revert "DO NOT MERGE"

This reverts commit 2c582170a868d34a55929681e1c7a9f53d0411ac.

Reason for revert: Causes NPE (b/293458004); will submit a clean fix after revert
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1be1e2a461a33bad6093c36bbc66450be04a35cb)
Merged-In: I5f8228f8548e9fd06f05384e0dd3bddb5293743c
Change-Id: I5f8228f8548e9fd06f05384e0dd3bddb5293743c