MediaTek patches

Change-Id: Id22f264ea3168e11b81cb6c6102b66db0249b47d