Change-Id: If661a17646e2698e92cfdfb1a3d0e5dd42e06279 BUG: 4061035 Signed-off-by: Mike Lockwood <lockwood@android.com>