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

Change-Id: Id2b2073acb3b901015b2b0d938a8cb5ee5a0270b