Merge "Fix tidy_checks"
am: 4bbefc9371

Change-Id: I21c691d41d408910c0f794ce1af9e2f213e2ccb4