Merge "Fixed NPE in SyncRequest for Bundle.EMPTY"