Merge "Merge "Fix wrong SafeUnref type" into pi-dev am: b09f2b5926" into pi-dev-plus-aosp
am: 9eecfb03fd

Change-Id: I7c08e82c93d169cb097c73d60b617ed7bd20b01e