Merge "Open source ic_fiber_manual_record_vd_theme_24" am: a0cfd39652
am: a9746905bd

Change-Id: I8e32f7802a7ea557ce8f2e21afd31695a5b4943c