Merge "Merge "Enable Checkstyle for "repo upload" for more projects." am: 899398113a am: 4f5ce75cbd am: 01f9244e81 am: ff82f33915" into oc-mr1-dev-plus-aosp
am: 409207c2dc

Change-Id: I9ad9728b7607649b83adf6e752e12b382068cbec