Merge "Add missing return statement in setTempFileRootDirectory"
am: d281b1a116

Change-Id: I9bbe241eec6aafdf41153cbc9c410b844ef63e2c