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

Change-Id: I7227c4bc4746aef1f64421132070dfce94d1a7c6