Merge changes I8175344d,Ic26c9b03 into main * changes: cpplint: fix and enable readability/check cpplint: fix and enable whitespace/blank_line GitOrigin-RevId: d02482c2e76f85c9efba863907c50b5d66601ad2 Change-Id: I527dbe1662535996c4985a79d10c02e99b7aa32f