Test fails Bug: 31455788 This reverts commit 02afcde4. Change-Id: I470becb29fda54db0db6f764a83efc926badb555