am d30325ba: (-s ours) am 5ae973dd: am 629b4376: Merge "Remove incorrect return value read"

* commit 'd30325ba99db9dfb22fc03954e40deda1e35cd6d':
  Remove incorrect return value read