[Added] A few more restricted names

Change-Id: If94e56a00ed3fa2f2e084a9dc3bb2791307a300d
[Fixed] Ackbar's Name Mantis 3402

Change-Id: I52e6f93a5b4b6ace7276ef78fa0fc97fe93d670d
Merge "[Added] A few more restricted names" into unstable
Merge "[Fixed] Ackbar's Name Mantis 3402" into unstable