Merge "batch the multiple insertion in one transaction" am: 96f89dac7b am: 88dec1f500
am: 78871519e5  -s ours

Change-Id: I6cae623d645eaa549e1470aff20559f2701dca10