Merge "Merge "Check if records is inited before removing items" into nyc-dev...
Merge "Merge "Check if records is inited before removing items" into nyc-dev am: f8a765bc am: f05c5f8a" into nyc-mr1-dev-plus-aosp
am: 0bd3eab2
* commit '0bd3eab2':
Change-Id: Ia2fc9550449be4efc3791102cc1236cd856c5bb6