Merge "BACKPORT, FROMLIST: Support the stable_inodes feature"
am: 43f6f573dd

Change-Id: Ia9e51982161b6255f9fd0422d34701536959fe19