Merge "Better error reporting for createOrUpdateLayer" into pi-dev
am: 67a58660b9

Change-Id: I3f3bcf4d83fcb6210baecf3b7f4e4cc2d8ad996c