Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev am: 697c8e9546 am: 8558aeb6f8 am: 526d943c90 am: 0c465b3dc3 am: b942c74fbe
Change-Id: Ic7243ef07476e6c2d51c20c72f126198ce622c59
This commit is contained in: