Merge changes from topic 'nci-2.0'
am: 021a826c4b

Change-Id: I0a22c64bedcebe919224bbfcd2c9e36be2d2401a