[automerger skipped] Merge "Fixed the doc" am: 28a33a26 am: 7100f13a -s ours am: d1ac9ac4 -s ours
am skip reason: Change-Id Ice5032ba84a24dd5d9091f80303ccbbc3bd1ff20 with SHA-1 f23e44e8 is in history
Change-Id: I9a7ddde51743c1c9e8206ac19f5ee378759c4086