Merge "Fixes possible issue with no-op creator." into pi-dev am: f5411070a8
am: df80c8d7cc

Change-Id: Ifd6bf40dae3f49caa078b7cbce89b740395d6128