Bug: 29188168 (for initial CL) Bug: 29778499 (reason for revert) This reverts commit efeb9f01. Change-Id: I21bc32fa07014bbce2eedba3686f09d3d45aec65