Squash Commits of Advanced PowerMenu + Common Interface/Classes [2/2]

Change-Id: I4a4ee7c76f7cb3fc6b9352ea8421c8907900da22

update

Change-Id: Ic33de19b1f735cb15cb70584d53b5004185313e1

=====================================================

Change-Id: I4a4ee7c76f7cb3fc6b9352ea8421c8907900da22
fix bad merge

Change-Id: I4493ec1d696c617b538f7c5ca3cd5fd47c2b813f
Merge "Squash Commits of Advanced PowerMenu + Common Interface/Classes [2/2]" into kitkat