Merge \"Ignore setxattr() failures on tmpfs.\" into nyc-mr1-dev
am: 1740304a03

Change-Id: Ib008b203486f5fa9b384ef06ac58079112c1d7c1