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