Merge "BGDexopt: Clean up ordering" am: 33ac5052c9 am: 1404b89b43 am: 7ef319f439 am: 8797ddb50d
am: 6d90dcccfd

Change-Id: I5d073604a932b77dd13ce47bc3f5b5f909f039b0