Use new override properties. Bug: 34929159 Test: phone boot Change-Id: Iea7f50d34020255d27a5a303da2801afecb60f25