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

Change-Id: I255eefb897d0161ce3cb5c6b4281e1e0f18fce41