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

Change-Id: I77202532d60368ebc18e754a5454eb6fa1b0e5dc