This reverts commit 7f1a5a79d1.
Reason for revert: Droidfood blocking bugs bug: 203025772 & bug: 203041994
Bug: 203041994
Bug: 203030884
Bug: 203025772
Change-Id: Iecb089045525e24b5e5ece312016eb20400da575
Merged-In: I768c13d2959fb92d2a5d038df560e1575aea0712