This reverts commit 4dd99003. Reason for revert: Droidfood blocking bug: 263067487 Change-Id: I5abc143b8f912c39e1224524d98d5c6621ac0d36