Bug: 192062380 Test: Compile pass Change-Id: I64a0cb0016cf6a4e8a9da85dbce5ba8934109763
2bd69d1eda
ea254c0383