Merge "Merge "Guard against app info crash" into nyc-dev am: c3ab03e
am: 9f6fcdf" into nyc-mr1-dev-plus-aosp
am: 647e70f
* commit '647e70f5c12cdf860f01f12af6979c9634c0bc75':
Change-Id: I0ff29433507bbde2f8d48d64d6c243f09d252d79
This commit is contained in: