Merge "Avoid a @Nullable Boolean" am: 1b3c82dede

Change-Id: Ib92c55ea8df7c6d0e8c0bcd0458d0925e6befc0a