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

Change-Id: I5490e154eb0bd253ac6b6ed7df403b9a506e4163