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