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

Change-Id: I44636b8f052b6e48f562f53869dcdfeffbcc0fc9