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

Change-Id: I786dd53e404aa5141a2cd81d0750a612b81e965a