Verified previous CL

changes from previous commit are verified by uploading to the board.