Merge "Added style check presubmit check" am: 05acb55690
am: 9454884d5f

Change-Id: I0c001bc5d26223579b501d862216e83318f52852