Merge "Fix resource directory references" into pi-dev
am: c82bcf4d3c

Change-Id: I7e92f5b46c7809273dc7b41918df9839df41dfd7