4.0.2 update

Change-Id: Iee463a1a48b2ad1003a5a795368af67352fab155