Bug: 37311645 This reverts commit 8648c5ed3d. Change-Id: If26d07a59dd9e71813a2b48f3bee25516bfb0b75
8648c5ed3d