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: 472bd627
* commit '472bd627':
Change-Id: Ia40ce5820925f0b666fff2779d331a8b9e82be05