Merge "Fix NullPointerException for devices without ODPM" into main