This reverts commit 0fc5c393. Reason for revert: Droidfood Blocking bug: 237349230 Change-Id: Ia0fa18ba1a72bc57f45b11f5954b6d8eada076ab