Update to match core changes in Idc11b547

Change-Id: I5481df33c7056cf2c661527f6ed3cf2374b6a0bf
Merge "Update to match core changes in Idc11b547"