Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."
am: 1813ae0159

Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e