Merge "Fix operators priority to prevent NullPointerException"
am: 3f5d2dea40

Change-Id: I312e74cf955c36f23936b86fe59fbcae3096edf9