This reverts commit 845d14db. Bug: 22942480 Bug: 22902898 Change-Id: If2d0e11594284414953c3dd45475fc7ba3366295