Merge "Merge "Correct return codes in documentation" am: 6439a23354" into stage-aosp-master