- Removed some unnecessary comments. Bug: 26317072 (cherry-picked from commit 509f2ab3) Change-Id: Id542262ca1182fb77f029f2136266e470bde9473