Staging for m8

Change-Id: I5012a56577487583058c1935b3d7b89fdb00eae4
Signed-off-by: DHOMD <DHO@dho.im>