Bug: 27555885 (cherry picked from commit 26876730) Change-Id: I6c0aee5c1823b6c498d9306e4a7c749b093e6834