Merge \\"Removed warning when objects are added on wrong order.\\" into nyc-dev am: a98e4512df
am: 7524b13642

Change-Id: Ied3eaa444419fcb6b429a2101d960ba0dcba449f