Merge "Fix CTS test for nine patch padding sanity check" into lmp-dev