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

Change-Id: Iae09c0c6e0d0b8cc9018b811c658d7d73e8a729b