This reverts commit 1223330ccc. b/37460568 Change-Id: I936c06f679126ac50fb2d4753b4270b4ba42def5
1223330ccc