Tracking v6.4.0

Change-Id: I434556e5ae449387a2f083d5b70eb091f20e0c4b
i777 and galaxysmtd

Change-Id: Ia8c9e2790418fe3f41ac21a4cbf2e8a2d3e5270f