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

Change-Id: Ia00e6eeb9d81451ecb6a9316d01b22c5289e8ef6