This reverts commit be3d9a3b. Reason for revert: Droidfood Weekly blocking bug: 194040982 Change-Id: If36f29b9275196d6042f0d110ad3cd6346c08931