Fixes bug b/2136633 Change-Id: If963d0267496878978ad82d915f821af2bd03383 Signed-off-by: Mike Lockwood <lockwood@android.com>