Also, print an indication when the DB is modified. And get rid of a silly loop. Change-Id: Ib0b25d51f389413ab255fd2332fcf211aeabec78
Change-Id: I1e79a0a50a2166660b601dfe2d886f00d7469c75