Merge changes from topic "pfw_python_3" am: d20b5c7d6f am: 7f51413ee0
am: 92bb815504

Change-Id: I25a851c53893e1f70cce7adbc738ffdd6a82e20c