DO NOT MERGE. Ignore setxattr() failures on tmpfs. am: 4ed6507cfb  -s ours
am: b9821c87f9  -s ours

Change-Id: I7611f18bda8f198894d78f6d095bbffd444ef276