Merge "Fix ANAPIC review comments (hardware/interfaces)"