Overlay manifest setting by package manager am: c39b0b23eb
am: 3ea010e8bc

Change-Id: Idab1fe772aa846db4691927e73f4eb648d36f020