Merge "Merge changes from topic "bt-fix-checkstyle-errors" am: 838ab94a am: 8ae54621 am: 24ad4cfc" into oc-mr1-dev-plus-aosp