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

Change-Id: I6a2c63c617235ca78618384d53130265af4c9385