Merge \\"Record \\"cache\\" inodes to clear while CE is locked.\\" into nyc-mr1-dev am: 57243a2a26
am: dfd98f988c

Change-Id: I082a6b8e3cd28a566714ec263821dccfc3e232ca