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

Change-Id: I92a944b0a493b67c4e19717cf4c42b6f3d876535