Merge branch 'mtk_mipicsi' into HEAD

Change-Id: I321f82d28a80e8fd98b249906e694dba98a9bea4