Merge "Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev am: a75bd7d4e0 am: 942bcffe7b" into nyc-mr1-dev-plus-aosp
am: 1c96b6177d
* commit '1c96b6177d1ad48a4522194a105aa5633b2c4d43':
Change-Id: I4dcfe8258dc0d4b2c9001a6f9bb256bd013d0109
This commit is contained in: