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

Change-Id: Ic0ad15b9eef3049bab98b01a6e495743988632f6