Merge "Return null when setting can't be changed." into pi-dev
am: c7b90ee998

Change-Id: I3112475e7cbe477f94c129be78d55b430760df75