Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b

Change-Id: Ie83c53a165c62344c21880ae68d60009fe1a5875