Bug: 36056613 Bug: 35979630 Test: already tested in original commit. This reverts commit 25bfd2fc. Change-Id: I69be60cf81d4a5159cdb7fc6bcb1859d2df3471d