Merge "Add OnMediaTimeDiscontinuity notification" into pi-dev am: ef3dbdbf73
am: eead9b0533

Change-Id: Iacb896821ea67240d663676b8c1f2d9385ef8bda