Merge branch 'nardtest2' of remote branch

Change-Id: I23b07721a3591b03540464201b852ddc650de998