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

Change-Id: I30763d5820002129ab7701c71ad084d4e941b07a