Merge "Update API ExtraRenderingInfo by review feedback" into rvc-dev am: 04a579c6 am: 584acb90 am: ce96226d Change-Id: If8eb382d369d51cf45e40802aeac115bb194dffd