Overlay manifest setting by package manager am: c39b0b23eb
am: 0a40cb0bf5

Change-Id: Ieff671aa2270a8d21e707c6f4c5ed54f952147a8