This reverts commit d711d4d2. Reason for revert: Shouldn't have submitted... (cherry picked from commit e1b73b14) Change-Id: I48054b667f5391d00ad40c43db5e23a4f42bbd2b