Merge changes from topic "bp-135269143-p" into pi-dev am: 604d91d713 am: bf25aeaa84
am: 4dd2150e42

Change-Id: Idc0c7d724190b78f8e22e2cbb674f9044a8b4e61