merge in pie settings

Change-Id: I0c26d9765cfa119a32843ce19e70ab1e53ba715f