Merge "Add ACCESS_FINE_LOCATION to permissions" am: a23ceba5c3
am: 5232a30b03

Change-Id: Ia0a212d075868e020a784233dd6d5d640523a3d0