Merge changes from topic "bt-cleanup-apply-checkstyle-step-19-20-21"
am: 980a4856a0

Change-Id: Iee9818f790a308f1421c288544b62eba0b5e2dc7