Fixes issue 6900. Change-Id: Ifcd3fa9c34cfca02ed5e7a94aded33984ac81c60 Signed-off-by: Mike Lockwood <lockwood@android.com>