Merge "Show the disclaimer regarding WFC location privacy policy" am: 5697a7e85d
am: fa412244c8

Change-Id: Id628e249c421740339dab7ce8abf60371fb12110