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