Merge \\"Fixed typo in comment.\\" am: ee2d222cc5
am: 4db3563589

Change-Id: I67e08946d15e71495a0d4df035bb2f34bd6ef76a