Overlay manifest setting by package manager
am: c39b0b23eb

Change-Id: Id606b315847f496fdc47e526f909c92bc47caaa1