bug: 28852327 Change-Id: I7744a7ed7f1f5e6630f8c3a9782d9a5539f5e0fe (cherry picked from commit b7bde9e1)