This fix is already in master, so just cherry-picking it here too. Change-Id: I28c57171aa3e55933c3e98555575a074b25b2b2a