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

Change-Id: Ia25ac3f5e46fb11f79266eae6fca03f476ef3d04