find7a main branch to kk4.4

Change-Id: I3f8c7a3e64ba3ce1b5c1de42a8b16c72588c8d5d