Test: atest Bug: 171191376 Change-Id: Id7208312dff0cc022c2f16b3872fae1a9dc09ed7
Bug: 137396965 Test: manual (cherry picked from commit 84b593d592a74aeddfce453bc8700180192199ed) Change-Id: Icac4000bd7323583f8a5f462ccb40826a4151765