tree 803b8706e879cd1f7b5055d46fa997bfeefe7030
parent 1725df6a3dc13bf5671baa39d6818ba32485bf39
author Walter Jang <wjang@google.com> 1478293419 -0700
committer Dirk Vogt <dirk@fairphone.com> 1498035779 +0200

resolve merge conflicts of e20a370 to mnc-dev

Test: same test cases as I0310c6e35cb378e1fe22691e5aecdb8ece1a3c9e.
  except ran them on Nexus 5 MOB3OH this time
Bug: 32219099

FPIIM-1289
FPIIM-1283

Change-Id: I6679d55fb0cb7618fd0557375e587375c940eaf0