Merge "Fix race condition in MediaHTTPConnection" into pi-dev am: d7c87b74d9
am: 7a72844fd5

Change-Id: Ie8a4a2ec2c6df33aba1d48d0b89f400a75c1233d