Merge "Support WAC decoding in UMTS format" am: 9bc9b80912 am: 6cf420a80e
am: 49d538731b

Change-Id: If03eba667943b68bed66eb77acdcc53dd22cf3ed