Merge "Fix restoring of layer type" am: 0b28b42 am: 8ce0be3353  -s ours am: 64ac4368c6
am: 8267b10955

Change-Id: Ic0084a6a2694b220867f26e18c1294f7b720e703