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

Change-Id: I7284363c3d413d193c799d5ea5b62baec3a858ad