Merge "Revert "Merge changes If65b4e6c,If993b7f7""