Bug: 37629514 Test: Ensure no compilation error; proofread Change-Id: Ia250c95da1edb20017bc13a4504ead092eb24fff