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

Change-Id: I40ad456d1c0a198983463fe2658fbf3f638f63a6