PM: Backport from 2.6.35

Change-Id: I6db133aee99a60003803a98f8c6b38050a3c4913
Signed-off-by: RonGokhale <cips173@gmail.com>