Test: built and tested on device Change-Id: I4e64cceca629c0b4c0a5d0a5ec23bc2d75f4aead
Bug: 130741987 Test: Tested on device Change-Id: Id6dd485c73f9453970b8d79929ffc04acb2c76c8