am: a75bd7d4 * commit 'a75bd7d4': Fixed a bug where autobundling could lead to bugs Change-Id: I41033eaf326565f73cd2cbb2eb0d2a16be0e430f