Needed Patches

Change-Id: I6d21e8fcb2144aa3f9bf6fe7813c71f4f4adf2f5
Missed one

Change-Id: Ib51f6f4aa975e6c21282b9e9a21539d85a5804a7