Imported Upstream version 0.036

Change-Id: Ia85b706cee5c8495cf960de7aa6ba9c9e6c2e86a