Merge "Persistence of LPP profile" into pi-dev
am: a6c06bdf5a

Change-Id: I6d8bbbb78924ad8f93e34721a56bfe83bdf16a04