Merge \\"Add null check for rtsp source\\" into nyc-mr1-dev am: bc7e8996c2
am: 881f62d5a1

Change-Id: Ief9e8946b187b699a9dbde0e1799e9906e2a38e5