It should already have been the case, but it wasn't and it crashed. Change-Id: Icb461d6e43ef2d113f59038d8c2327f3cfaff86c (cherry picked from commit cf069ca5)