Attempt fix for M8 User.

Change-Id: Ia99c26d8af8f21c8cf0f14626b73c1890bfa62b7