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 am: 2be54fde72 am: 5c152a3d7f
am: d7e2ae5fc7

Change-Id: I9b24f761959dfe7a88509b65273e31916d9ddfc1