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

Change-Id: Iedf8e18ed3c3c555d40534d6a00a47faff376c63