Merge "Check for sidecar null-ness before removing" into oc-dev
am: 59f965d698

Change-Id: Ia9a520419b67304342b528220a592c7629e4c1bc