Merge "Protect sp assignments in RemoteDataSource." into oc-dev
am: 318e41b4b3

Change-Id: I6f44a1b3f6e9a586463a0d7938da9fd69b803f1d