am 21b45b62: am 25c66c3a: Merge "Fix document." into ics-mr1

* commit '21b45b624f5b5f888d0bfa89da7ecb58a0398dbe':