Fixes b/2121632 Change-Id: I14228a4fd1d599de1e5fdbb3c8b4b3c02a1460ac Signed-off-by: Mike Lockwood <lockwood@android.com>