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

Change-Id: I744e2febd16c65c58b7313e704d26d03adc6be9c