Manual changes from aospa-legacy settings repo