Those functions will be used for a PV improvement. Change-Id: Idb4f4fdd2558d6cb7b7c936697e923fd7ea3ff3a