Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev am: 697c8e95 am: 8558aeb6 am: 526d943c Change-Id: I540bcfd5cc88a4db8a14086de77f005c01026e71