This reverts commit faa5265e. Bug: 130267141 Reason for revert: Working on full fix. Change-Id: I3ab736720f9a5310c42878d757002681e139dcc7