Bug: 159145361 Test: manual Change-Id: I8f1be55971672c7e8f5aa8848f65b1b9d9f40fb5 Merged-In: I8f1be55971672c7e8f5aa8848f65b1b9d9f40fb5 (cherry picked from commit 3b6905bf) (cherry picked from commit 1d507600)