Merge "Fix NPE when calling Session#add" into pi-dev
am: 8b7f7f1aa5

Change-Id: Ibe98f60804d9e4945b11871f5bd5a817f800cd07