Merge changes from topic 'NCI-2.0' am: 430dded515
am: 4d08be4a52

Change-Id: Ie427005b3fa448a33c1756afdea66715914c4ff4