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

Change-Id: Id185e8078af79e1ca3d66df67dad213f116d3fc3