Merge "Avoid a @Nullable Boolean" am: 81a42af40d am: fd9c242128

Change-Id: Id445c7151b8828df42e362eb2391357a18d06dee