Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev am: 697c8e9546 am: 8558aeb6f8 am: 839fe7b4f1 am: 7200d8e175
Change-Id: Ic55f2dd1b1b6f997d7130d54d26cd497503efd5a
This commit is contained in: