Bug: 28108421 Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e (cherry picked from commit 5182e272ad)
5182e272ad