This reverts commit fc93d732. Reason for revert: re-uploading with fix Change-Id: Ica78710bfc40dfaac74152c7aec1985f6e19fd6c