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

Change-Id: Ibfa5a20731caae48c7961ab0452a72d7bff34cf0