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