Bug: 62602192 Bug: 65260586 Fails on device. This reverts commit 26765207. Change-Id: I6cd54ff445828c39663156a8420224fd9a042c47