[automerger skipped] Merge changes from topic "png_uninit" into pi-dev am: 0127c2920a
am: c616ad70b6  -s ours

Change-Id: Id1371fa1214f3656fbfcea47dbccbd3d93ca8821