Merge "Merge changes from topic "bt-fix-checkstyle-errors" am: 838ab94a0f am: 8ae5462199 am: 24ad4cfc48" into oc-mr1-dev-plus-aosp