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

Change-Id: I4b5ed46b14943d11de07032a9d1388cf274ccbc7