It shouldn't be a problem to put this in -- it is a static final so it doesn't actually need to be in the on-device system image. This is important for the SDK. Change-Id: Iaa086247d0d65fe708c40fbab506aa60cd3e1396
4deb52f3
20777fae
584bce31