Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev am:...
Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev am: a75bd7d4 am: 8b624e59
am: 97ea6c17
* commit '97ea6c17':
Fixed a bug where autobundling could lead to bugs
Change-Id: Ia98a345663d0838524b3521d372885f8df86af47