Merge "Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am: 74a2af11b9 am: 0817640c9f am: 41c60ea30e am: e2424e9895  -s ours am: a51cfb3a00  -s ours am: d77a443db4  -s ours am: 9dd993e516  -s ours am: 3ed228d80c  -s ours am: e003b8931d  -s ours am: 8c8012d126  -s ours am: 7f145e886d  -s ours" into oc-dr1-dev-plus-aosp