Tiny test patch

Change-Id: I983e84d231430a9dc4886b2405a89883207417d8
Merge "Tiny test patch" into production