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

Change-Id: I3f56752a4c044c216bf1161ac778a349941ed541