Merge changes from topic "remove_art_tombstoned_parameter" am: 0044036588
am: 327f9989a9

Change-Id: I932976ebd1b608b79a4440cee9804b9d87aa4430