Bug: 27940102 Change-Id: I373093d9b85dca356aaa8798931d5315981fd74c (cherry picked from commit 2afb636180)
2afb636180