Merge "Make services.core the final priorityboosted jar" am: a0c1780d3c am: 93de069ec9
am: ff6fcaec0b

Change-Id: I6ba33f829ed72ee799b4855021ba1f136ea49bd4