Bug: 27398183 Bug: 23128949 Bug: 26846185 This reverts commit a96917a6. Change-Id: I5c4f0d87d3293a6a7ab56a33396670704b66a347