Bug: 72325

Change-Id: I11c6c7b41d63aa199b80735d700a73f6af5c697e