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

Change-Id: I5fd6fc7a0a968e6050e78297748e0bbfdc057dbe