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

Change-Id: I6679d55fb0cb7618fd0557375e587375c940eaf0
7 files changed