NOTE: This affects only the SDK and not the system image. bug:5485208 Change-Id: I2b086e880cfe147883a0db8222522710132d67a3