I317: Add Support

Change-Id: Ib564ceee3e2f2a3ddca608742dc53c5cfbb05f24