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

Change-Id: Ie5dd5b973659690629c369e860a2b694dd69a5d3