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

Change-Id: If0b4fe113312a0bd7df0a987b54786511ced7d21