Imported Upstream version 0.36+git1acdff3

Change-Id: Ia850be88f3e7ffc8dcd23f1b13f04f14996e28e3