Merge "C2BqPool: Handle generation # retrieval failure" into qt-dev am: ff52d12ac1
am: a8d21fce70

Change-Id: I2757ee1494ecc3c67c6f34e93e161039eaab6a75