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

Change-Id: I998c99667093eebd57d372f6690bb38b665d011b