This reverts commit 4b95879634. Change-Id: I09fd9c843a4d32a131b87cd638785af552f81507 Test: None - revert
4b95879634
3fa963b28e