Merge "update with -Wdocumentation."
am: 213914b33c

Change-Id: If5c7170381a22a56415fa9b92accb55fd258be98