Merge \"Merge \\\"Removed warning when objects are added on wrong order.\\\"...
Merge \"Merge \\\"Removed warning when objects are added on wrong order.\\\" into nyc-dev am: a98e4512 am: 7524b136\" into nyc-mr1-dev-plus-aosp
am: ca2f00f8
Change-Id: Ief58244e3252f38599701e7d990a855909b6b306