change on the tagtest branch

Change-Id: I70bb843303b653c4052cbe141ae6ebce96331116