Bring up-to-date with V30D Sources

Change-Id: Ia11b0ee90a0e74c5de1d15a6ecb6f1f9015f668c