Many optimizations

Change-Id: I3acaa62dff4ca844a2e8c64d4756c7739940b07f
Debugging on eng build user

Change-Id: I5c746346c3d68a688fc40077b90cd1638118f6b1
Merge remote-tracking branch 'franco/mirage' into mirage