Merge "Framework: Restrict warning message" am: 1c4a22fb08 am: dce76b96f8
am: 7ab7657e92

Change-Id: I8c4b6892bb609f48d72b917ce1b8a49851671737