am 56700e24: (-s ours) am d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev

* commit '56700e24b4ea68701589ff731a3397fa8ee47ca8':