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

Change-Id: Icbe9b69db03dc7c3bc39b576e138efdb5642516f