Bug: 28685551 Bug: 27682580 Bug: 28797012 This reverts commit 9de98ef4. Change-Id: Ic4a21194ad602f4897f088a66672f3dd9f30f607