rebasing with master after switchPOC was merged

Change-Id: I14dcda2432abf8e8aed310c68b04ce5c9c8547e6
Signed-off-by: Jamo Luhrsen <james.luhrsen@hp.com>
(cherry picked from commit 13f49cd5fe5237fcb90469f867aa4bfa0ef61559)