Merge "Fix ANAPIC review comments (frameworks/base)"