Bug: 4063041 Change-Id: Ia1b4f29d3e54ec21aa64407720d9d5db62855380 Signed-off-by: Mike Lockwood <lockwood@android.com>