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

Change-Id: I36717e881a9984f58b80e47a0cc175005178231e