Merge "Fixes a bug in verifying the validity of a session info." into ub-launcher3-dorval-polish
am: b0b30d23c0

Change-Id: I7d521d877c81fdd35b20910bc73143696bc92a76