I am hoping this will fix bug b/2155529 Change-Id: I46ea34898864d7b39391d76b802858c0f092b578 Signed-off-by: Mike Lockwood <lockwood@android.com>