This brings in improvements like --check --diff support Change-Id: I3a07902d5bd92d0e0178d93e2a0994a19b376884