am 25977558: am 3b101dcc: Merge "Fix edit contact background on nexus 9" into lmp-mr1-dev

* commit '2597755882573d9724eb12804e44a773b6af4df4':
  Fix edit contact background on nexus 9