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

Change-Id: I447f0ee5bcf0c7b3db98a1b54cb4cfb061a7541f