Backport m4u from jellybean

Change-Id: I0b00ced21c8ac38cfa111503cc4b96a76620ab5d