Merge changes from topic "png_uninit" into pi-dev
am: 0127c2920a

Change-Id: I559efe65a830c8f14abac36017909a063f50ee87