Merge changes from topic 'nfc-style'
am: 1d4862a6c2

Change-Id: Ic1339a30f4122f3c1abbcc852cbd38a1b750c36c