Merge "Query for test userspace reboot property" am: 35b0226283

Change-Id: Ic1e6210938d1ded812b101fd06ece2cb3c0a80da