(cherry picked from commit 68ca373929) Bug: 204153604 Test: TH Change-Id: If4afabdc65ed2ac3e918af1d4a03c4c9173c4a3c Merged-In: If4afabdc65ed2ac3e918af1d4a03c4c9173c4a3c
68ca373929