Fix reverted fix again

Please have a look at PS8 in Ib057aee. I fixed exactly this issue!
I was so proud I found it before (!) it got merged. Can anybody
explain to me why the heck it got reverted? I really don't get it.

Bug: 68032
Bug: 68033
Change-Id: I369688d86dca7a6da97742b992c75e35250e7499