Bug: 183407956 Test: UnitTest, CTS test Change-Id: I0886dc13075245587411b3fed7c4429a3af7a4a0 (cherry picked from commit 2952934a)
