Merge "Fixed the issue when some apps were gone and couldn't be installed...
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae01
am: 2be54fde
Change-Id: I14e1d5aa6bda143e2a87bba1ea65b8384c44e3a1