bug b/2178462 Change-Id: I409d9b4a163299c3383ec092cd2368a9d24236cb Signed-off-by: Mike Lockwood <lockwood@android.com>