Merge "Update system api for applyPayload" am: c8f699d327 am: 8187d5301e

Change-Id: Ib9c8fcd961c301cbf32d2ca57c8914ec96891cbd