Overlay manifest setting by package manager
am: c39b0b23eb

Change-Id: Iae03f04cae20eac1a6313861f7e3e77b8a30a9de