Merge changes from topic 'nfc-style' am: e397b73792
am: 68a86b448c

Change-Id: Iad4e44eaf060374a047e838360a785ac678f055e