Design proposal updates

Change-Id: I97354a7df80e92909562ad9aefbef88faa9fe044