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

Change-Id: I373e4b6ac08a28a3995d37e1eab7dd79032c60d9