aosp Change 70505, Add new keys, EAP set/get methods