This fixes issues caused by:
Corresponding upstream commits:
Change-Id: Id8fe9307f71262260d51aac81151d8ca66ca9e93