Merge changes from topic "pfw_python_3"
am: d20b5c7d6f

Change-Id: Ib5b660acc0f9492d7b5345ea6f3f5772d6ee7b4d