Merge changes from topic "remove_art_tombstoned_parameter"
am: 0044036588

Change-Id: Ic6c50db7aeb44bfd5a39bb77a655c34ede3339cc