More optimization and ota update

Change-Id: I1f1aef72482e68b45edd47b64c20922ca28c05ac