Add Moto E (condor) support
Merge Aospa-legacy Changes