Minor changes for labs testing

Change-Id: I8bcdb15da1a0ecb30d9350d2e9b8616556576f54
Merge "Minor changes for labs testing" into production