Merge "update with -Wdocumentation." am: 213914b33c am: 9267ba9201
am: 92dd0c6422

Change-Id: I4c6a5a593d9d769c48f6618b4b8e7b3de1fad9f4