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

Change-Id: I47cf64c8e073a611651e4267d0d6e43551ab7cdb