Merge "Fixes regression caused by ag/9259064" into qt-qpr1-dev
am: ffa02fadce

Change-Id: I62e69a9b32a5e3c2f39264a5101410a697db8b9e