Merge "Add METADATA to sqlite: Apache2=NOTICE" am: dd2d1f433e am: 34bdb683ac am: d8912b614d

Change-Id: I3422e0571fab3027dfef8441ab7be0decf893bdb