Merge changes from topic "vkjson-relocation" into pi-dev
am: 1163c37270

Change-Id: I1c57df8347bbedf608caa77b8b1ac62f8adc4ced