am 89424f35: (-s ours) am b4430c5c: am 541ba710: Merge "Add FlpHal layer to support Location Batching." into klp-dev

* commit '89424f35f774076c3845226b87f9136f00751b2f':