Merge changes from topic "bt-fix-checkstyle-errors"
am: 838ab94a0f

Change-Id: I4e619cb17582a6cc954814654820cd945f66e1cc