Maintain compatability with the old finding for now for the convenience of commit order. Change-Id: I99b236cbb3d61b00650e3da7fe5931d4c4b3fec6