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

Change-Id: I0f322ff26b62af29290acbe1f7258b3f3b54af2b