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

Change-Id: I5cf10a143bba4351efa2ea22fc5ccddb732f3044