Merge "Added style check presubmit check" am: 05acb55690 am: 9454884d5f am: 19ab681003
am: 7cd8c0d0c2  -s ours

Change-Id: Ib1285c3ab3fa5443e9fd53ef9e8e97a3f3882113