Merge "C2BqPool: Handle generation # retrieval failure" into qt-dev am: ff52d12ac1 am: 265eb9954e
am: 9cc693e07f

Change-Id: Ib808d4e034dae2868c2dccfb8bf9aac87cad422e