To resolve merge conflict for aosp/1175775 Bug: 142004000 Test: Manual Change-Id: I89b0ab44920b1deefe7523e5f19ed1c799c4c658
ce9a776f1d
39cbd1fb92