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

Change-Id: I940f776f7504df3f93de618dad4552d398c5ba32