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

Change-Id: Ia6681f02f3c28ede76335ebd921e92e9db7a450c