Revert "resolved conflicts for merge of 4a59376d to stage-aosp-master"

This reverts commit e16a21c6b4f108813e5f5e00f30e0ff075de504c, reversing
changes made to fb231fea6cd4dac7323b1df74006b294c3c9bfef.