Bundle support. am: f19d56d468 am: 1e0b66632e am: b6427eb1e3 Change-Id: I6d547f30396b8f39d1053928d0af5f01ccbca8b9