Merge "ART: Change shutdown order" am: 19052df439 am: dac33e4a6e
am: 7f1a8f1052

Change-Id: I7c8fb67e672a085d1f83e6997690f9b2d7a77ca3