Bug: 28108421 Change-Id: Id0253fed98790f4c8eeb27877e14cf53474f29f0 (cherry picked from commit 418d3817)