Bundle wants me to make these changes.

Change-Id: Ia9c984b2600a2a3de07c61613f75dca89fee2eca