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

Change-Id: Ie6445033edf3ddb0e0a005fc6f0cd5d137abd571