Merge "Prevent crash on uninstall." into nyc-mr2-dev am: f755dfb89e
am: ea566a0687
Change-Id: If7f409779796fe419475fc58b71b49c9d473c9aa
This commit is contained in:
f755dfb89e
am: ea566a0687
Change-Id: If7f409779796fe419475fc58b71b49c9d473c9aa