Merge "Framework: Restrict warning message"
am: 1c4a22fb08

Change-Id: I6236d8f5a4433fa73c931679fdd2c071b726b0f1