am 1d82a8f5: Merge "Fix LocationManagerTest#testGpsStatusListener test failure on fugu/molly/MTK boards." into lmp-dev

* commit '1d82a8f57f47f61e3cd87cb13121ff78d1ac1195':
  Fix LocationManagerTest#testGpsStatusListener test failure on fugu/molly/MTK boards.