Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev
am: a75bd7d4e0

* commit 'a75bd7d4e01985c8ad8aa57960337cc3507f374a':
  Fixed a bug where autobundling could lead to bugs

Change-Id: Ice2ec07392808c127cac7424f2e193789d712ece