Merge "Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev...
Merge "Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev am: a75bd7d4 am: 942bcffe" into nyc-mr1-dev-plus-aosp
am: 1c96b617
* commit '1c96b617':
Change-Id: I4dcfe8258dc0d4b2c9001a6f9bb256bd013d0109