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

Change-Id: Ie134b81cb6c553c20fe13d7cbfbd5d7c4a754a59