Bug: 27398183 Bug: 23128949 Bug: 26846185 This reverts commit a96917a6. (cherry picked from commit 35122443) Change-Id: Ib02401c76bf28e1aac6bbce01f97ddd0373c1ba5