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

* commit '4903fa9fdf9998e23ddd44aee599b2054e387bba':