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

Change-Id: Ia899131af99385915d215ba03e6924d655a72923