Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev am: 697c8e9546

Change-Id: I0ff301bca47fdd225f42c3b6af10125a74b595a5