Revert "second mainline commit" This reverts commit f6be2929faec9a46d46fe15cfa16a54e39480428. Change-Id: I67594a4f33e6aeaf66d030f28a0922c633ec9f4d Reviewed-on: https://chromium-review.googlesource.com/809349 Reviewed-by: Aviv Keshet <akeshet@chromium.org> Tested-by: Aviv Keshet <akeshet@chromium.org>