bug: 19904089 bug: 19903495 This reverts commit 7e4c3508. Change-Id: I15df746b5f1882cce78eedde6c05c0d3b69bfa4a