Staging for M8

Change-Id: I83a81b0a7bea8918ecdf8757493f2807607d72b5