Add more patches

Change-Id: Id2a7d954c808515458e7d107683a200d7683497e