Merge "Merge "Fix bypass BAL via LocationManager.requestFlush" into sc-qpr1-dev am: 8980004b5e am: 8be88110e8 am: a5a13ed200 am: 7eb3630796" into tm-qpr-dev