This reverts commit 4fe5d002. Reason for revert: DroidFood blocking bug: 262355071 Change-Id: I74ecd73b533d39f4737849105193ae731e2a782a