Bug: 137388956 Test: Manually tested. Change-Id: I6acd7aad9203b66b293766e25c1e22f7ed01d7be
mentioned in commit c30c6060
mentioned in commit bec0cbb1