Merge changes from topic "b_78809704" into pi-dev
am: 92b64bb1bb

Change-Id: I08a9b59d00c9e7aa075c21c44b582d571fe79fd7