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

Change-Id: Ib940c4a54821c23aff204e01a0bd097615864415