Bug: 18471342 Bug: 19958712 This reverts commit 61f675bb53. Change-Id: I87d3655d1238a9cf26d96dcb0665ba5110931800 (cherry picked from commit 686a557689)
61f675bb53
686a557689