Merge "Remove mips workaround." am: d621bdcd9a am: 98cfaf5b4a am: dbe1db07e8 am: 778644cae3

Change-Id: I52c3fff7b6567b5e314892736cfa97d6c4875651