Revert "Merge commit '744e99a' into merge"

This reverts commit b0da9254a9b687dc4e38e253967357570562d3fa.

Change-Id: Iea6058d06e4e14d9bbe3376f3b68ac2210fa8945