Restore build in <= 4.4 tree

Change-Id: I7cdb4df67543192e1777071eea9525c293c0ebd2
Merge remote-tracking branch 'Tasssadar/master'