Merge "Support WAC decoding in UMTS format"
am: 9bc9b80912

Change-Id: I7efc88e5878e68b571d55fd386ad022b9a662bc3