Merge \"media: add/fix asString for temporal layering types\" into nyc-mr1-dev
am: b48527f663

Change-Id: I1204f6861caf63fba5abeb586f4b5cb68406368b