Will re-land after fiing vogar. This reverts commit 3185c8da. Change-Id: I6f5ed14aa3f7deb768195c0797125a34c6255d85