Merge changes from topic 'nci-2.0' am: 021a826c4b am: aff88ee03d am: 3e14fc72d8
am: 07358595f8

Change-Id: Ie211066b99b7cf7edd89e2e6f06bf2bc6857c44d