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