merge from stock kernel

Change-Id: I8c2fbfe6cbcb9cf1e3878e696ea09c90c8b7632d