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