Merge "Remove checkstyle from development/checkstyle." am: 06b3b45f6f am: 327d16e647
am: 24cc2e3cf0

Change-Id: I0c5da4cc205b5303e31dd27965053afdb6063e8d