Merge "Add support for updating apns when only resource changed" am: fd5b413829
am: 48c71e45d1

Change-Id: Iac7bd1eaa355d6c95903dfd5c358e355f619d61c