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

Change-Id: I261b953da7e9edb048becbfcfffb3925f2371ec2