Test: Code review BUG: 111091230 Change-Id: I25d9ba4059a335008998c91b3f6e9fb57c0f7ed7 (cherry picked from commit 39c5d359)