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