Bug: 170231230 Test: incremental and PackageManager unit tests Change-Id: Ia26306a4b1ca70ce70d55ce807fea62540f89334