Merge "batch the multiple insertion in one transaction" am: 96f89dac7b
am: 88dec1f500

Change-Id: I57be8a278f36bb224815ceb56b6060be39804c76