Merge "Open source ic_fiber_manual_record_vd_theme_24"
am: a0cfd39652

Change-Id: Id803f019142ad4c0a19b1bc11ad6e594f6c5f058