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

Change-Id: Idd846f9cb3f80cf9c5324155dee975d400dd91be