Merge "media: fix issues with video profile levels am: 2fc9c6925a am: 49f982ec7b" into nyc-mr1-dev-plus-aosp
am: 48f203e2be

* commit '48f203e2bee9bbf98f6d8eb32f16575c6f5ecb0c':

Change-Id: I3b62d4bfe09eda447fe312fa6b057fb31e6ccef0